fix(desktop): show local diff stats in v1 workspace hover card by saddlepaddle · Pull Request #3881 · superset-sh/superset

saddlepaddle · 2026-04-29T23:21:20Z

Summary

v1 workspace hover modal was reading pr.additions/pr.deletions from the GitHub PR snapshot while the sidebar row showed local working-tree stats — the two surfaces disagreed and the modal LOC appeared to flicker as PR data refetched.
Centralize the additions/deletions math into a new useLocalDiffStats hook (wraps useGitChangesStatus) and use it in both the sidebar row and the hover modal.
Drop the PR-stats fallback in the sidebar row so the value is the same before and after hover (no flicker).
getWorktreeInfo now also returns worktreePath so the hover card can drive the local git query without prop-drilling.

Workspace list view (WorkspaceRow) is intentionally left alone — it shows closed worktrees too, so any change there needs a separate think-through.

Test plan

Hover a workspace in the v1 sidebar — modal +/- matches the inline +/- on the row and stays stable across refetches.
Make local edits → both surfaces update via git:changed invalidation.
Workspace with no PR still shows local diff stats in the modal.
Branch (non-worktree) workspace shows correct local diff stats.

Summary by cubic

Show local working‑tree diff stats in the v1 workspace hover card to match the sidebar and eliminate LOC flicker. Compute the stats once in WorkspaceListItem and pass them into the hover card; remove PR-based LOC from the workspace list view.

Bug Fixes
- Hover card shows local +/- counts, matching the sidebar.
- LOC badge appears without a PR or remote and stays stable across refetches.
- Removed PR-based LOC from workspace list rows to stop flicker.
Refactors
- Inlined diff math in WorkspaceListItem (removed useLocalDiffStats) and passed diffStats to the hover card, collapsed item, and context menu.
- Dropped PR-stats fallback and reverted the prior worktreePath addition to getWorktreeInfo.

^{Written for commit 15546ab. Summary will update on new commits. Review in cubic}

Summary by CodeRabbit

Refactor
- Unified diff statistics (additions/deletions) calculation and display across workspace components, now relying on locally computed data for consistent rendering in hover cards and context menus.

The v1 workspace hover modal was rendering pr.additions/pr.deletions from the GitHub PR snapshot, while the sidebar row showed local working-tree stats — so the two surfaces could disagree and the modal LOC appeared to flicker as PR data refetched. Centralize via a new useLocalDiffStats hook (wraps useGitChangesStatus) and use it in both surfaces. Drop the PR-stats fallback in the sidebar row so before-hover and after-hover stay consistent.

coderabbitai · 2026-04-29T23:21:34Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 6aa295bb-0f2b-4afe-acac-c9770682f9d5

📥 Commits

Reviewing files that changed from the base of the PR and between df3af8f and 15546ab.

📒 Files selected for processing (4)

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/CollapsedWorkspaceItem.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceContextMenu.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx

🚧 Files skipped from review as they are similar to previous changes (2)

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceContextMenu.tsx

📝 Walkthrough

Walkthrough

The changes refactor how diff statistics (additions/deletions counts) flow through WorkspaceSidebar components. WorkspaceListItem now computes diffStats explicitly without falling back to githubStatus.pr data, and passes it as a prop through CollapsedWorkspaceItem, WorkspaceContextMenu, and WorkspaceHoverCard, while WorkspaceRow removes PR diff stat rendering entirely.

Changes

Cohort / File(s)	Summary
Data Flow Refactoring `apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx`	Reorders query and hook declarations, removes `githubStatus.pr` fallback for `diffStats` computation, and explicitly passes computed `diffStats` to child components.
Hover Card Updates `apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx`	Accepts optional `diffStats` prop and uses it for additions/deletions UI rendering, replacing prior dependency on `pr.additions`/`pr.deletions`.
Prop Threading `apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/CollapsedWorkspaceItem.tsx`, `apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceContextMenu.tsx`	Both components add optional `diffStats` prop and forward it to `WorkspaceHoverCardContent`.
Simplification `apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx`	Removes GitHub status hover hook and eliminates PR diff statistics rendering from the row component.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

🐰 Hoppity hops through the sidebar stream,
Diff stats now flow like a well-planned dream,
Props passed down, no fallback sight,
The data flows clean and just right! 🌿✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly summarizes the main change: showing local diff stats in the workspace hover card instead of relying on PR snapshot data.
Description check	✅ Passed	The PR description is comprehensive and well-structured with a clear summary explaining the problem, solution, testing plan, and rationale for design decisions.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch centralize-loc-retrieval

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Review rate limit: 7/8 reviews remaining, refill in 7 minutes and 30 seconds.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx`:
- Around line 173-180: The hover card currently only renders diffStats inside a
branch gated by PR presence, so local workspace +/- counts (diffStats) are
hidden for non-PR workspaces; update the WorkspaceHoverCard to render diffStats
unconditionally when available (remove or move the PR-specific conditional that
surrounds the diff-stats block), ensuring the JSX that references diffStats (the
<div> showing +{diffStats.additions} and -{diffStats.deletions}) is evaluated
for regular workspaces as well as PR workspaces; keep existing null/undefined
checks on diffStats but decouple it from the "pr" branch so local diffs show in
the no-PR hover modal.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 2a3bb0a7-a544-4766-8944-27a2d3045f2f

📥 Commits

Reviewing files that changed from the base of the PR and between 24a07cd and 5afa70b.

📒 Files selected for processing (6)

apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx
apps/desktop/src/renderer/screens/main/hooks/index.ts
apps/desktop/src/renderer/screens/main/hooks/useLocalDiffStats/index.ts
apps/desktop/src/renderer/screens/main/hooks/useLocalDiffStats/useLocalDiffStats.ts

Lift the LOC source up to the parent (WorkspaceListItem already computes it for the inline +/-) and pass the same value into the hover card, so the modal renders whatever it's handed instead of fetching its own copy. Also render the diff stats in the no-PR and no-remote branches — they were previously gated behind PR presence. Reverts the worktreePath addition to getWorktreeInfo since the hover card no longer needs it.

… view The workspace list row was reading additions/deletions from the GitHub PR snapshot, which can drift from the local working tree and refetches on its own cadence — values appeared to flicker. List rows don't need LOC, so drop the display (and the now-unused githubStatus prefetch).

The useLocalDiffStats hook was only called in one place; the other three imports were just for the LocalDiffStats type on a prop. Inline the useMemo back into WorkspaceListItem and use a structural type on the prop instead — drops the hook file and its index export.

github-actions · 2026-04-30T00:00:19Z

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

⚠️ Neon database branch

Thank you for your contribution! 🎉

#3881)" (#3887) This reverts commit b508fb3.

Already integrated, superseded by current versions, or net-empty in this fork: superset-sh#3881 superset-sh#3887 superset-sh#3917 superset-sh#3925 superset-sh#3940 superset-sh#3956 superset-sh#3961 superset-sh#3974 superset-sh#4017 superset-sh#4048 superset-sh#4049 superset-sh#4055 superset-sh#4063 superset-sh#4070 superset-sh#4092 superset-sh#4110 superset-sh#4138 superset-sh#4159 superset-sh#4163 superset-sh#4164 superset-sh#4209 superset-sh#4210 superset-sh#4249 superset-sh#4349 superset-sh#4405 superset-sh#4462 superset-sh#4464 superset-sh#4494 superset-sh#4495 superset-sh#4500 superset-sh#4535 superset-sh#4541 superset-sh#4566 superset-sh#4580 superset-sh#4589 superset-sh#4593 superset-sh#4603 superset-sh#4637 superset-sh#4642 superset-sh#4655 superset-sh#4657 superset-sh#4659 superset-sh#4685 superset-sh#4692 superset-sh#4745 superset-sh#4789 superset-sh#4797 superset-sh#4824 superset-sh#4835 superset-sh#4847 superset-sh#4885 superset-sh#4896.

coderabbitai Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread ...ents/WorkspaceSidebar/WorkspaceListItem/components/WorkspaceHoverCard/WorkspaceHoverCard.tsx Outdated

saddlepaddle added 3 commits April 29, 2026 16:32

saddlepaddle merged commit b508fb3 into main Apr 29, 2026
7 checks passed

saddlepaddle mentioned this pull request Apr 30, 2026

revert: "fix(desktop): show local diff stats in v1 workspace hover card (#3881)" #3887

Merged

2 tasks

saddlepaddle added a commit that referenced this pull request Apr 30, 2026

Revert "fix(desktop): show local diff stats in v1 workspace hover card (

6e0e006

#3881)" (#3887) This reverts commit b508fb3.

MocA-Love mentioned this pull request May 8, 2026

upstream merge 2026-05-08 PR 4: host-service tRPC retry/cache/timeout MocA-Love/superset#458

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(desktop): show local diff stats in v1 workspace hover card#3881

fix(desktop): show local diff stats in v1 workspace hover card#3881
saddlepaddle merged 4 commits into
mainfrom
centralize-loc-retrieval

saddlepaddle commented Apr 29, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Apr 29, 2026 •

edited

Loading

Walkthrough

Changes

Estimated code review effort

Poem

❌ Failed checks (1 warning)

Uh oh!

coderabbitai Bot left a comment

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

saddlepaddle commented Apr 29, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Summary by cubic

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Poem

❌ Failed checks (1 warning)

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Apr 30, 2026

🧹 Preview Cleanup Complete

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

saddlepaddle commented Apr 29, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Apr 29, 2026 •

edited

Loading